in debug messages, display "suite" with its label instead an integer, minor include directive cleanups