Cleaned up; removed warnings.
Minor fixes for clang.
Using updated version from new HL, with slight mod.
Removed bogus type qualifiers (maybe GCC only).