A bunch of cleanup and fixes related to annoying builtin runtime things.