Move object files out of the way
Move task waiting where it belongs.