Tidy system config
Parameterize affiliation types when checkout-page verification is selected
Add human-friendly strings for affiliation types