Merge "Fix all debug directives."