Improve indentation of blocks inside if/while headers

Fixes #1665