Definitely something which will be fixed with the element restructuring you proposed and we request in https://bugzilla.mozilla.org/show_bug.cgi?id=1007148