> It sounds a bit simpler, but there would be no way to go from hashed > to non-hashed tokens without starting with an empty database.
Yes, pick one or the other. We have to maintain this code and it's already too complicated. -- Daniel Quinlan anti-spam (SpamAssassin), Linux, http://www.pathname.com/~quinlan/ and open source consulting