This was stemming from our use of the HEAPTYPE flag for our builtins,
and cpython inferring "is builtin" from that.

Also, fix a couple other minor things that I ran into.