Fix popr/popl annotations.