Yes, that is much nicer.  Don't feel like cutting another branch so I'll ask @beck to fix it in #9