Hi, Resending these now that 1.7 is out. The first patch should result in a little speed gain because for most commands only one (or no) regex is needed. The second patch eases maintenance some, and makes pylint a little happier -- probably shouldn't have said that ;-) c