Unlabelled breaks were not targetting the correct enclosing control structures. Also added a test and improved error messages.