A little progress in CommandScanner