Fix mechanics for dealing with mutable types