Fix help breakage.

And add tests.