Cleanups.
Renamed 'idle' -> 'rest'.