Enforced consistent data types up to run_demo.