Merging as there are only defines cleanup. If breaks something, it can be fixed afterwards.

—
Reply to this email directly or view it on GitHub.