Moved into 'daoopt' namespace and some related cleanup.