Replace various short-ternary operators with null coalescing ones

Replace various short-ternary operators with null coalescing ones #725