Some minor cleanups

Weird function names, unnecessary resets of new HMACs, unneeded
variables, etc...