vectoriser: follow changes in mkClass