The Pull Request To Close This Year's Pull Requests

Yep. @jankeromnes, give me a few questions if you want, then merge this, thefiletree is already running it.
1. Neater.
2. Guarantees that it stays consistent, the current file closing system is error-prone for API users.