Small cleanups to unused debug code
Add more logical variants