Good name collation.
Full hook function detection.
Comments and more generic return handling.
Added in the main codegen, as yet untested.