Minor change: some namespace simplification

(This fixes compilation in some older compilers. No substantial code changes, so I'll merge when test passes.)