And while we’re at it, 1) mark domains as https-only, and 2) when root domains map to a subdomain (eg www).

I might amuse you to know hat we also already have a text file as a solution for https-only sites.