Split command parsing out of , updated usage message