Neaten up IO builders, remove unnecessary inheritance.