Switch to using std::experimental::optional instead of xstd::optional