Pull state reporting changes into 1606_ox branch

Stylistic thing - I prefer not to leave commented-out code around, since it just clutters things up.  One can always go back to Git if one needs to resurrect old code.