Add support for more built-in types.