Fixes the merge issue that's been done.
Merge pull request #409 from typesafehub/wip/h3nk3-merge-issue-cleanup

Fixes the merge issue that's been done.