MDL-43867 Atto: More cleanups for accessibility plugins