Tasks 1 and 2 in Sarah's "Global changes to speed up editing" are now complete. The second was a bit complicated because identifying the context for it was predicated on the existence of a hyph, but the hyph had been commented out in the preceding task (#1). However, a very messy regular expression match against the commented-out hyph did the job, after some tweaking.

NOTE: This includes major changes throughout the files, so, for the record, these changes all took place in one revision, rev 1346.