Deleted garbage introduced by merge
Renamed NewCodeOutput and NewTypeConversions to CodeOutput and TypeConversions