OK I'll create a separate pull request for that.