Avoid a few compiler warnings

There were a few cases of g_return_if_fail / g_return_val_if_fail
confusion in goa, and build.gnome.org makes the resulting compiler
warnings visible now, so clean that up.