WIP don't stash too much, send replayed deliveries ASAP

Please review @patriknw