And now I see why it is needed. As a side effect I deduplicated the mutators in 8815f53 a bit.