Unify and clarify a couple of macro definitions in NBNXM