Refactoring to enable easy machine experiments.