Nitpick cleanups

cleanups and tests.  Nothing earth-shattering.   Good stuff for moving RMQ closer to version 1.