Various refactorings and cleanups

Clearer token validation
Ensure decryption never happens if token is invalid
Simplify interface, remove verifier block API
Docpatch