Small front end tweaks.

`end` at 8, 6 is not aligned with `if` at 4, 32