We can just use std::nullopt and std::make_optional to make this a
little bit less noisy.