Clean up platform builtins stuff

Now it's all shiny and tidy