* Hide debugging code into #ifdef, which allows to simplify
  the large switch statement
* Update macros to not reference variables not given as
  arguments
Signed-off-by: NJan-Benedict Glaw <jbglaw@lug-owl.de>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>