Fix bug 2401; also removed the need for the separate gvpack_builtins.c file.