Clean up namespace handling

No match.