I didn't do that originally because this PR was meant to be just cleanup. It looks like I can't do that though without accidentally nerfing things so I suppose this will have to go together.