Simplify logic to allow commands with dashes.