Use a decorator to replace redundant wait logic

[lrbom]

In many places in the tool, most notably in _cpslib.py, there is a lot of duplicated code for handling polling wait. This can be refactored to use a wait decorator for better modularity and readability.

[kdlucas]

I think you've been contributing, so please submit a pull request and we'll take a look.