Remove option type from MatchResult.Success case