Intial debug from metaaccumulate refactor - just a few import and signature changes.