Use the cli's new flags.

Fixes #86