Replaces all use of NullIfArgIsNull and DefaultIfArgIsNull with compositional counterpart when(?, Fn).orElse(..)