-private
WIP: built in types fixup