A few more fixes around break statements.