Simplify by removing shouldDebug flag.