tombstoned: refactor request dequeuing a bit.
am: ef042d3fc5

Change-Id: I038a35e46b719d01fff2033f9ad6c2b08cc88dfe