In the meeting today, we agreed it would be a good idea for the part of tidy that checks that FIXMEs have issue numbers to run in a separate target, called commit or something, so that you can add FIXMEs while working without having to add issue numbers until you check in. So the workflow would be: make check... [repeat ad infinitum], and once you're ready to commit, run make commit before committing.

The only catch is that people have to remember to run make commit...