Fix formatting oscillation in if-then-else branches

Fix formatting oscillation in if-then-else branches #1233