Fix up annotation.js to conform to new style.