Adds compat::optional and expected