Limited mark-mode support.
Merge branch 'asutherland-mark-mode'