Create objects for PropertyValuePairs when iterating edge containers

Reusing objects here is too dangerous and leads to errors.
Fix typo in methods for decoding statement rank