* commit '954e3e90181533041858f230cc10388f4c90e014': Require command and argument separation, cleanup.