A bit more work on #6

Clean up pbkdf2 w/r/t `progress_hook`