arc/pm integration cleanups

Can we remove this with the stdio bound?