Update assemble_experiment for new input/output types. Cosmetic changes.