Simplify indentation rules for guards

@garyb @joneshf @jdegoes Could you please review?