Simplify (and very very slightly speed up) the pbkdf2 implementation