Move mutable optional value types to beta5 changes