Introduce mark stickiness, and explicit mark types