Switch to direct hash access, rather than halibut