Some PDF work refactor.

 - Minor changes
 - Rename ClaimantPresenter > PrimaryClaimantPresenter for the above. ET1 form
   only has one claimant also.
Used the present macro to DRY up