ok, i'll put a little more love here.  this is the kind of enhancements that should be backed by some failing tests...