Removed some dependencies on old functions from Frogatto.