Create Interruptible wrapper for deadlines

At the moment, we have code like this that attempt to attach arbitrary deadlines to Interruptible waits. We should make a wrapper class that attaches new deadline guards but acts like the original interruptible.