Add control-group markup for error highlighting

    Unfortunately these add stupid margins all over.