Refactored Experiment a bit, removing some redundant fields in the
process.
Refactored again; removed some more fields.