Cleanup, disable .arg in .arg template
Cleanup, fixes
Ability to disable parameter info, handle some broken code cases