Restore compatibility with macro versions.