Fix filter map race

Part of fixing #55.
This is kind of hard to test, I'm punting for now.

The API change should prevent accidental races, Mist will be updated to match.