Some more cleanup in ApiWikibase.

Change-Id: I9db65ece2f551012ea9cb51ba32bcde6e6f46bdb
Merge "Some more cleanup in ApiWikibase."