Include <boost/optional/optional_io.hpp> instead of <boost/optional.hpp>
    
    Keep the old behavior in one case, where a std::map is printed, and
    the corresponding operator<< isn't available.