Remove unused quark arguments all around the matcher code