GPII-784: Added support for old preference style payloads via URLs. Added tests for them. Did a bit of cleaning