Tidy up WikiGraphLoader - make more efficient.