Some protections needed for stand-allone use added.

No match.