Cleaning up Apache HC driver

Minor changes - should be straightforward.
Follow-up commit on its way. Thanks for spotting that!