More debug simplification
Clean up and fix a few newly touched code paths