Mark the roles of Ptr and FunPtr as R, not P!
Merge branch 'master' into roles