More debug cleanup. Since all testing is done via the CLI for now, we can use static local variables.