Simplify code

Need to split up fields to:
  - DigestField
  - HMACField
  - PGPPublicKeyField
  - PGPSymmetricKeyField
The first list can probably go, as it is being repeated in the second, grouped list.