Prevent more vertical code alignment cases

See [wikipedia arguments against vertical code alignment](
http://en.wikipedia.org/w/index.php?title=Programming_style&
oldid=592550160#Vertical_alignment)