Fix Trac #2713: refactor and tidy up renaming of fixity decls