Tweaked state/status rollup to better match the spec in ticket