Elementary support for more built-ins