Fix location of spliced-in role annotations.