defining a macro for two lines of code introduces more noise

.. than it solve

Change-Id: Ic60021aa428289fffb26bc349425e9b8be520d0a