More indent consistency.

With the shorter names -- e.g. `pdo` instead of `parser-compose` --
can fit more on same line, don't need some now-gratuitous indents.