Fix merge fallout

This brings things in line with upstream.
Merge pull request #24 from kmcallister/merge-fix

Fix merge fallout