Properly (un)index retracted accounts in state machine; #553