This is a good point Hadley, thanks.

Bryan, if you want to wait a day or two I'll make the changes to my pull-request version.