More cleanup and enable of compilation of examples.