Consider at some point whether or not they are worth upstreaming. (also __pf_rdr belongs to this batch)