Refactoring to ease Provenance development.