Fix indentation.
Remove unnecessary Apricot:: qualifiers.
Make ns non-optional for NamespaceReference.
Rename ns to qualifier where it could be either Namespace or Module.