Adapt to HashMap being moved to libcollections