Better namespace handling.