Indeed, this change should be pushed upstream, too, since all our options are supposed to be double-dashed now. :)