At the moment, we're getting around this by using a custom script at dist/s_goto.py to remove indentation on goto labels.

I've submitted a patch to add an IndentGotoLabels style option here.