Clean up, simplify offer handling.