Actually privatize a IntegerTypes, and fix a few bugs exposed by this.