Some cleanup, shrink some of the types in conf.h.