Cleaning up Apache HC driver

Minor changes - should be straightforward.