Bugfix for a rare RPR-related enc/dec mismatching when JVET-Z0056 (GPM reordering) enables for GEO MMVD, and refactor SW.