Change constants to use immutable types.