The rules of 8.2.3.1.1, even as amended by Bug 3269, Bug 4242, and Bug 4261, still don't completely cover the possible cases.

(a)
There is no rule that handles
    test * with element of element * OptTypeSpecifier.
Rather than introduce a new rule, we can generalize rule 8 to cover all element types:

    ---------------------------------------------------------
    statEnv |- test * with element of ElementType : ElementType

Similarly for attribute types and rule 16.

(b)
There is no rule that handles applying an element name test to a non-element type. So add this rule:

    not( Type is an element type )
    ---------------------------------------------------------
    statEnv |- test NameTest with element of Type : empty

Similarly for attribute types.