Finally figured out how to make AStyle put else's on their own line.

Reformatted code base accordingly.
Formatting after merge.