* 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: Jan-Benedict Glaw <jbglaw@lug-owl.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>