Added the necessary parentheses to the macros to
spare operator-precedence-related bugs in the future
from the use of the macros.