Removed some xpath constructs.
Added method to convert definition list to ListMultimap.