Unified builtins2

This is just a merge commit and nothing else, but it's really huge, so I want to make sure to test it. I will just push this commit upstream once I verify it passes the tests.