Clean up marker model.
Introduce a run value.