Preliminary cleanup of gmx hbond

Just starting to clean up things in preparation for a memory optimization change to the code here.

Please note that other clean up changes will likely follow.

Refs #4371 (closed)