Simplify some $ENABLE_DEBUG expressions

Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c