CRM-15555 remove last instances of refs to hard-coded payment field types