Thanks, I'm amending the commit to address this comment and the two above.