Improve debug code and lexical scoping of masks