Ok, then for the first one, please add a comment to the list of defines too.

As for the spec, I see it says "and log a warning" - so we should log it, but not throw a notice (that suddenly could show up in the output of a site).