Mild improvement to the idle handling.

Forgot one and removed a few; this is more in line with the intended
outcome.