Tweaks required by the latest optparse-applicative