Replace locally defined entities with entities from global "general.entities" where possible.

Remove extraneous XML tags and regularize references to authors by using items from global
"contributor.entities" wherever that is possible. Patch some punctuation.