Clean-up process_inbound a bit.