Prevent additional single-line if indentations [Fixes #1325]

I believe this addresses the cases @akostadinov presented.