Oh yeah, it's not easy to refactor (I would have done it already :P).    If we've got to chose between two evils, I think that this PR is better. It's not going to indent but at least the comments are going to be stable and at the right place (instead of the crazy way they are now).    Also, this is a very very edge case.