Partial revert of removal of reset_statement_flags
Make parsing of bare if/for/while/do consitent and beautifiable.
Tweaks statement indent unwinding to handle nested bare if and else
Reduce the cases where output needs trimming by indenting tokens when printed.
More space output cleanup.