Fix CommandTimeout handling.

The refactor broke CommandTimeout handling, which will result
in a NameError. This fixes it by adding a new CommandTimeout
exception in scope and removing the old classes.