Using optix's new ability to validate callable function params to fix a
few mismatches.