Use g_assert() instead of g_return_val_if_fail(), suggested by Sheldon