Major Section: NOTE-2-8
All the guard-related changes may be found elsewhere; in particular, see note-2-8-bug-fixes.