Simplify labelled-block handling so it works better with switch statements.