next fixes for bitwisw AND to bool conversion in macros