Finish converting to restartless, plus some other cleanup.

Hooray!