Add isCLIRecord check in addRecordTypeName.
Fix missing 'this' arg for non-CLI constructor decls.