Fix some return_(val_)_if_fail mismatches

https://bugzilla.gnome.org/show_bug.cgi?id=722023