General "will foo { ... }" cleanup

Marked as NYI: final init end catch control compose
Now also work: begin check
Todo: make $_ refer to the variable being defined