Changes reflecting new annotation API.