Ensure consistent typing across operands of ?:

Completes earlier patch for #1