Refactor some code to simplify and better type receipts stream adjacent code.