return_if_fail vs. return_val_if_fail fix