CATCH-ANY now properly classifies RETURN/REDO even when it causes errors, etc.