More namespace work.