More namespace cleaning.