Simplify code

Need to split up fields to:
  - DigestField
  - HMACField
  - PGPPublicKeyField
  - PGPSymmetricKeyField
This line is untested.