CWG3016 Satisfying the syntactic requirements of #include and #embed

Wording reconciled with earlier CWG3015.

Author: tkoeppe

source/preprocessor.tex

@@ -413,8 +413,9 @@
 is searched for as if that preprocessing token sequence
 were the \grammarterm{pp-tokens} of a \tcode{\#include} directive,
 except that no further macro expansion is performed.
-If such a directive would not satisfy the syntactic requirements
-of a \tcode{\#include} directive, the program is ill-formed.
+If the preprocessing token sequence does not consist solely of a \grammarterm{header-name}
+or cannot be combined\iref{cpp.include} into a single
+\grammarterm{header-name} preprocessing token, the program is ill-formed.
 The \grammarterm{has-include-expression} evaluates
 to \tcode{1} if the search for the source file succeeds, and
 to \tcode{0} if the search fails.
@@ -425,8 +426,6 @@
 preprocessing token sequence were the \grammarterm{pp-tokens}
 of a \tcode{\#embed} directive\iref{cpp.embed},
 except that no further macro expansion is performed.
-If such a directive would not satisfy the syntactic requirements of a
-\tcode{\#embed} directive, the program is ill-formed.
 The \grammarterm{has-embed-expression} evaluates to:
 \begin{itemize}
 \item