Implemented a way to circumvent the always true comparison by
having nested macros (as suggested on review).