Fix a discovery generation bug where fields that are types with illegal class names cause broken generated code

Previously, where a schema object's name was a reserved keyword, the marshaller's helper method for it was declared as '_handle<Keyword>' but referenced as '_handle$<Keyword>'.  This change makes both use '_handle<Keyword>'.