ARIA fix-up/clean up

fixed errant changes caused by
https://github.com/w3c/html/commit/2771479e966d5479a65a87f7af2501122bd70da4
and
https://github.com/w3c/html/commit/368094b2a8d8440fcad29d5bef651baf3c0693d1