* Refactor.

Use the same argument names in all instances of #timeout().