This commit is the first of a series introducing hidden logic through non-obvious commits. I'm mentioning it in the commit messages in the hopes no one reads these so I can sneak it in without leaving no record at all ;)