[dcl.type.elab] Move note to separate paragraph

Also clarify that the next paragraph is talking about any elaborated-type-specifier at all, not just the ones in p4.

Author: Quuxplusone

source/declarations.tex

@@ -1556,17 +1556,20 @@
 \begin{note}
 A \grammarterm{using-directive} in the target scope is ignored
 if it refers to a namespace not contained by that scope.
-\ref{basic.lookup.elab} describes how name lookup proceeds
-in an \grammarterm{elaborated-type-specifier}.
 \end{note}
 
 \pnum
 \begin{note}
+\ref{basic.lookup.elab} describes how name lookup proceeds
+in an \grammarterm{elaborated-type-specifier}.
 An \grammarterm{elaborated-type-specifier} can be used to refer to
 a previously declared \grammarterm{class-name} or \grammarterm{enum-name}
 even if the name has been hidden by a non-type declaration.
 \end{note}
+
+\pnum
 If the \grammarterm{identifier} or \grammarterm{simple-template-id}
+in an \grammarterm{elaborated-type-specifier}
 resolves to a \grammarterm{class-name} or
 \grammarterm{enum-name}, the \grammarterm{elaborated-type-specifier}
 introduces it into the declaration the same way a
@@ -1586,7 +1589,7 @@
 
 \pnum
 The \grammarterm{class-key} or \keyword{enum} keyword
-present in the
+present in an
 \grammarterm{elaborated-type-specifier} shall agree in kind with the
 declaration to which the name in the
 \grammarterm{elaborated-type-specifier} refers. This rule also applies to