Updated and normalized Hosted Payments and Card-on-File logic.