Single line changes from @mtbc
Use HashMultimap in Preprocessor