Updated to use new version of Yaz (names changed to avoid C++ conflict).