Clean up some sleeping conditionals