Rework ACK management again

Don't hold on to pointless promises when we get ACKs. That will probably help
with memory...