code gardening
fix handling of callable expressions operands in conditional expressions