74X: Further HLT cleanup and bug-fixes

74X: Further HLT cleanup and bug-fixes - includes #6810