- Refactored a lot of timeout code into a few functions in an attempt to make

  them all use the same (hopefully correct) logic to make it less error-prone
  and easier to introduce library-wide where it should be used.