Yeah, I was told I broke pep8 (the comment has since disappeared but the reviewer didn't delete it) so I fixed it as a review action. It seemed sensible to remove it from this list at the same time but you're right, we should keep them separate for simplicity.