fixed further ifdef references for RoleAnnotations