Some debugging changes to try to get at these dispatch errors.