Debug: Minor cleanup

Address crazybob's comments.

Avoid referring to a static in one of the helper methods.