ESource: Minor code cleanup.
ESource: Minor code cleanup.

Distrotech/evolution-data-server,matzipan/evolution-data-server,matzipan/evolution-data-server,tintou/evolution-data-server,tintou/evolution-data-server,tintou/evolution-data-server,matzipan/evolution-data-server,Distrotech/evolution-data-server,matzipan/evolution-data-server,matzipan/evolution-data-server,Distrotech/evolution-data-server,Distrotech/evolution-data-server,tintou/evolution-data-server,Distrotech/evolution-data-server