Various parser fixes

Please don't place two case statements on the same line.