Bootstrapified and other cleanups