More namespace related cleanup.