Switch to plugins to handle specifying available markings.
Merge branch 'marking-plugins'