Some edits in preparation of publishing on DCC.