Revert changes from #45. Unfortunately this didn't *just*
add enum group information, it changed some parameter names and
types incorrectly.

Fixes #46.