Fix const-ness of CppArgHolder, now it always matches the the actual
type
Simplify object and enum rules
Merge branch 'kris-fix-const-value' into kris-current
Merge branch 'kris-subclass' into kris-current