More Debug Fun

Sigh. Just cleaning things up for my own amusement.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>