73X: Further HLT cleanup and bug-fixes

73X: Further HLT cleanup and bug-fixes - includes #6801