I replaced a check for `!is_null(x) and isset(y)` to simply `isset(x, y)` since these are logically equivalent.