* Fix test.
* Faster removal from array.

It's amazing how a solution can be found if you think about it and don't accept
an inferior solution.