Minor namespace cleanup.