Include nullopt and make_optional to align w/current standards proposal