Hdevtools: fix column calculations.  Cleanup.