Replace `intcmp ...' w/ `if ...'
Replace `intcmp ...' w/ `if ...', clean up, and

Add some internal DEBUG vs. NO DEBUG possibilities.