[PATCH 2/2] Make our gtk_* decorators safer and more intelligent