If you use them you should rather fix the GtkGrid code indeed.  The equivalent on GTK3 is per-widget align/expand (you can see https://developer.gnome.org/gtk3/stable/ch28s02.html).