Fix callback matchers to take controller instances

Controller matchers operate on instances of controllers, not controller
classes themselves.