It looks like I can clean up my mess in most cases by replacing GOTO with 
EXIT.

Thanks to Alain and Ian for their suggestions!

Bruce Moore