Avoid bare attributes due to issues with Xerces parser - Fixes #2