Simplify the `remove` method further.

No more double look-ups. Closes #2.