@gwprice ok, i added another commit to increase semantic happiness (if at the expense of a little index space).