Modernization sweep

After which I'd like to cut and ship `v3.1.0` :smiley_cat: