Further author cleanup, for back-references