More stuff from my namespace update.