Modularise yes-no-mark directive, closes item:53