Minor refactoring in how we interact with the eh-module.