I'll do that, as I said, but I think we should change ``remaining``to throw an exception if used outside of ``within`` and then add an ``expectTimeout`` method that returns ``SingleExpectDefaultTimeout`` because it is absolutely hideous. Then we can see how many tests call ``remaining`` when they shouldn't and we can change them to use ``expectTimeout``.

Deal?