Config class cleanups.