more xdebug refactoring