I'm going to go ahead and do this myself rather than nitpicking the PR to death.