Add in a MaybeGetValue that wraps up TryGetValue in an option