diff --git a/d0355r3.html b/d0355r3.html
index cc6a1d5..fc6281c 100644
--- a/d0355r3.html
+++ b/d0355r3.html
@@ -1047,8 +1047,8 @@ constexpr day operator-(const day& x, const days& y) noexcept;
constexpr days operator-(const day& x, const day& y) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const day& d);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const day& d);
template <class charT, class traits>
basic_ostream<charT, traits>&
@@ -1075,8 +1075,8 @@ constexpr month operator-(const month& x, const months& y) noexcept;
constexpr months operator-(const month& x, const month& y) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const month& m);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const month& m);
template <class charT, class traits>
basic_ostream<charT, traits>&
@@ -1103,8 +1103,8 @@ constexpr year operator-(const year& x, const years& y) noexcept;
constexpr years operator-(const year& x, const year& y) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const year& y);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const year& y);
template <class charT, class traits>
basic_ostream<charT, traits>&
@@ -1127,8 +1127,8 @@ constexpr weekday operator-(const weekday& x, const days& y) noexcept
constexpr days operator-(const weekday& x, const weekday& y) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const weekday& wd);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const weekday& wd);
template <class charT, class traits>
basic_ostream<charT, traits>&
@@ -1146,8 +1146,8 @@ constexpr bool operator==(const weekday_indexed& x, const weekday_indexed&am
constexpr bool operator!=(const weekday_indexed& x, const weekday_indexed& y) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const weekday_indexed& wdi);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const weekday_indexed& wdi);
class weekday_last;
@@ -1155,8 +1155,8 @@ constexpr bool operator==(const weekday_last& x, const weekday_last& y)
constexpr bool operator!=(const weekday_last& x, const weekday_last& y) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const weekday_last& wdl);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const weekday_last& wdl);
class month_day;
@@ -1168,8 +1168,8 @@ constexpr bool operator<=(const month_day& x, const month_day& y) noe
constexpr bool operator>=(const month_day& x, const month_day& y) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const month_day& md);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const month_day& md);
template <class charT, class traits>
basic_ostream<charT, traits>&
@@ -1191,8 +1191,8 @@ constexpr bool operator<=(const month_day_last& x, const month_day_last&a
constexpr bool operator>=(const month_day_last& x, const month_day_last& y) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const month_day_last& mdl);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const month_day_last& mdl);
class month_weekday;
@@ -1200,8 +1200,8 @@ constexpr bool operator==(const month_weekday& x, const month_weekday& y
constexpr bool operator!=(const month_weekday& x, const month_weekday& y) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const month_weekday& mwd);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const month_weekday& mwd);
class month_weekday_last;
@@ -1209,8 +1209,8 @@ constexpr bool operator==(const month_weekday_last& x, const month_weekday_l
constexpr bool operator!=(const month_weekday_last& x, const month_weekday_last& y) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const month_weekday_last& mwdl);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const month_weekday_last& mwdl);
class year_month;
@@ -1230,8 +1230,8 @@ constexpr year_month operator+(const years& dy, const year_month& ym) no
constexpr year_month operator-(const year_month& ym, const years& dy) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const year_month& ym);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const year_month& ym);
template <class charT, class traits>
basic_ostream<charT, traits>&
@@ -1260,8 +1260,8 @@ constexpr year_month_day operator-(const year_month_day& ymd, const months&a
constexpr year_month_day operator-(const year_month_day& ymd, const years& dy) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const year_month_day& ymd);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const year_month_day& ymd);
template <class charT, class traits>
basic_ostream<charT, traits>&
@@ -1290,8 +1290,8 @@ constexpr year_month_day_last operator-(const year_month_day_last& ymdl, con
constexpr year_month_day_last operator-(const year_month_day_last& ymdl, const years& dy) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const year_month_day_last& ymdl);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const year_month_day_last& ymdl);
class year_month_weekday;
@@ -1306,8 +1306,8 @@ constexpr year_month_weekday operator-(const year_month_weekday& ymwd, const
constexpr year_month_weekday operator-(const year_month_weekday& ymwd, const years& dy) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const year_month_weekday& ymwdi);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const year_month_weekday& ymwdi);
class year_month_weekday_last;
@@ -1322,8 +1322,8 @@ constexpr year_month_weekday_last operator-(const year_month_weekday_last& y
constexpr year_month_weekday_last operator-(const year_month_weekday_last& ymwdl, const years& dy) noexcept;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const year_month_weekday_last& ymwdl);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const year_month_weekday_last& ymwdl);
// civil calendar conventional syntax operators
constexpr year_month operator/(const year& y, const month& m) noexcept;
@@ -1375,20 +1375,20 @@ template <> class time_of_day<seconds>;
template <class Rep, class Period> class time_of_day<duration<Rep, Period>>;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const time_of_day<hours>& t);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const time_of_day<hours>& t);
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const time_of_day<minutes>& t);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const time_of_day<minutes>& t);
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const time_of_day<seconds>& t);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const time_of_day<seconds>& t);
template<class charT, class traits, class Rep, class Period>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const time_of_day<duration<Rep, Period>>& t);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const time_of_day<duration<Rep, Period>>& t);
// time zone database
@@ -1411,13 +1411,13 @@ class ambiguous_local_time;
// information classes
struct sys_info;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const sys_info& si);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const sys_info& si);
struct local_info;
template<class charT, class traits>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const local_info& li);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const local_info& li);
// time_zone
enum class choose {earliest, latest};
@@ -1445,8 +1445,8 @@ template <class Duration1, class Duration2>
operator!=(const zoned_time<Duration1>& x, const zoned_time<Duration2>& y);
template <class charT, class traits, class Duration>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const zoned_time<Duration>& t);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const zoned_time<Duration>& t);
template <class charT, class traits, class Duration>
basic_ostream<charT, traits>&
@@ -9613,8 +9613,8 @@ bool
operator!=(const zoned_time<Duration1>& x, const zoned_time<Duration2>& y);
template <class charT, class traits, class Duration>
- basic_ostream<class charT, class traits>&
- operator<<(basic_ostream<class charT, class traits>& os, const zoned_time<Duration>& t);
+ basic_ostream<charT, traits>&
+ operator<<(basic_ostream<charT, traits>& os, const zoned_time<Duration>& t);
template <class charT, class traits, class Duration>
basic_ostream<charT, traits>&