[CB-2654] Use explicit hasCallback flag rather than trying to detect whether a callback was used