C++11

Reference #1401.

Change much stuff to use new library.
`Wait`?