Hotswap: Remove a level of indirection and magic
Hotswap: Reduce clutter.

The hotswap.Hotswap class is now a Shuffler thread, nothing more.
Remove unnecessary conditions
Reimplement hotswap.Hotswap as a pair of utility functions