Update to match changes in gtype.lisp