Improving macros

Readability improvements

TODO.

Speed improvements

TODO.

Reliability improvements

TODO.