More struct updates for using BuiltInClass as base for structs.