I would recommend NOT using BEU's. Create a flag called "I_Need_Fixing" (say M1.7). When you want to do exit a block early, use
A M1.7
ON M1.7
BEC
When you have finished, do a search on M1.7 and you can then remove all your testing without leaving any BEU's behind to trip you up.
Also, do not comment out code, but jump around it.