Redo label handling to prevent some nasty little ISEs