A separate pull request for that change would be much appreciated. :)

Once it's merged, you can rebase this commit on top of it.