Be explicit with the API, avoid unnecessary obfuscation.
Be explicit with the API, avoid unnecessary obfuscation.

Motivation:
* The macros make it more difficult to understand the code.
* They are against the principle of least surprise.
* IDE tools like EDTS do not handle them correctly.
* Variable names are being lost as they become X, Y, Z.

esl/escalus