- per a suggestion from Jason Trill (jjt on github); after looking at it a while, i think it is a bit more natural.. :)
(and a few minor changes)