Small clean ups in Changes related code

This are some small bits split from If6c96e0. I still don't know
what causes the error there.

Change-Id: Ic4950314d320105e36abc2eb7678f01451288ba7
Merge "Small clean ups in Changes related code"