Yep, your commit made me realize how messed up it was.  Thanks!