more cleanup as I write up an entry to the RB mailing list