The only reason I avoided putting them all in the same file was that it might make the PR more difficult to read, since I'll be renaming it from `affix-spec` to `spec` or `main-spec` or something. I'll do that.