Issue #162 - Handle multiple environments of macro

definition, and removed debug code.