C++ cleanups.
We have a nice portable delay call... use it.