Make some use of shiny new builtins