Domina: changed substitions to only appear in values, never keys