Track the committed state on tokens.

Fixed container references.