That's a good suggestion -- and it looks like I can, thanks.  Will do that in a follow-up commit.