Update ggp-spectator to use ggp-base directly