circ: fix use of CircControl; staff user branch