Shortern/cleanup debug message more.