I'll open a separate pull request for this, thanks.