Add extra checks in macro engine.