Fair enough, I think that might be something to put in a separate pull request though.