Cleanup: Some renamings, re-activate assertion for type argument/parameter count mismatches
Clean up some comments