Cleaned up improvements to WikidataDumpLoader