Merge "Reordering probability tables for consistency."