Tidy up code and comments.
Add tests for canonical form.


git-svn-id: https://svn.apache.org/repos/asf/jena/trunk@1560173 13f79535-47bb-0310-9956-ffa450edef68