update to support recent annotation changes in EAVL.