Switch ggp-database to use ggp-base directly