Code cleanup (use QNames in more places, and avoid putting an XML attribute in observation into a namespace); remove unused imports.