The double underscores were used to work around issue #12808, which was solved in 2016.
Also doing fmt inplace as requested.