Separate commit. John has been wanting pull requests to remain topical and not be a bunch of things all at once.