Unrelated to feature in this pull, just fixing to use proper annotations.