Pull state reporting changes into 1606_ox branch

As mentioned previously, these stats have to be integers.  We can't report booleans here.