Make formatChoice expect a currying function

Fixes #16