Simplify use of default namespace prefix

Relates #457