RT-93521 - Support caller_cx (patch by Ben Morrow)
caller_cx only works on >= 5.6.0 for now
Remove unused variable (silence warnings under -Wall)