Make sure to handle the more efficient back-end format that doesn't create unnecessary pairs.
Created attachment 292093 [details] Patch
Fixed in r207556.