common-cli: Improve command match