Add some missing bits, and make it generally a bit more useful outside
of REQ_PC requests.