Much more clean up in SqlUsageTracker

Oh wow, this was confusing. Sorry to say that. Some $entityIds
contained actual EntityId objects, others strings. An $entities array
should always contain Entity objects, not something else.

Change-Id: I360124c8df1896896c1183fe8567e6d5d979eb08