In the orderedset code we can just remove these temp variables and just inline them instead, making the code a little bit easier to read. Change-Id: I6454f45a4e202a087cd6b195095f22c43e7bdab4