Move away from tuples, as there is no good YAML support for them