Random and hopefully good changes.

Using `$timeout` is definitely better (if nothing else for testing purposes).