Fix SimpleSiteLink usage and exception in EntityIdPropertyUpdater

Change-Id: Ib5023952df5b1a825677aa3d7a25d2d1cdfea608