Improve type error reporting for offer in CP.