Mostly fixing up indentation of continuation lines,
and other small cleanups.