Some significant cleanups. I'm doing a pull request so that you know about this and don't get tripped up on the merge. I've tried to be quite explicit in the commit messages, so have a look at them.
Coverage increased (+0.1%) to 99.162% when pulling 7b875367d0eb3800678c3b3cb08430c110d30458 on cleanup into c2c8fd5e9f71d3c4373436f7049905868fbe3f3f on master.
Some significant cleanups. I'm doing a pull request so that you know about this and don't get tripped up on the merge. I've tried to be quite explicit in the commit messages, so have a look at them.