Debug Info: simplify code a bit.