Includes a bug fix discovered while doing the pass (misuse of
`makeNotFound` helper), and inserting `noflow` annotations in the files
I don't want to deal with yet, so I have an easy-to-grep-for marker that
I can find again later.