Clean up some short conditionals