simplify/style-tweak/refactor rest of the conditionals

Last one, I swear. :-)