swift234

Group all the builtin types together to allow some amount
of re-use.

Swift SVN r2394