Update use of role annotations to new syntax.