Implement namespace-local keywordization
Fix full roundtripping