This isn't updated for the split `mark_*()` methods in the base class.