TS-2367: Couple fixes to make builds happy
TS-2367: A better way to declare an argument as unused
TS-2964: Make hash runtime selectable - fix gcc issues.