category = (null == category) ? entry.getValue().getDescriptor().getDefaultCategory() : category;
Set<String> macroNames = result.get(category);
if (null == macroNames) {
macroNames = new HashSet<String>();
}
<BUG>macroNames.add(entry.getKey());
result.put(category, macroNames);</BUG>
}
}
return result;

category = (null == category) ? entry.getValue().getDescriptor().getDefaultCategory() : category;
Set<String> macroNames = result.get(category);
if (null == macroNames) {
macroNames = new HashSet<String>();
}
macroNames.add(macroName);
result.put(category, macroNames);
}
}
return result;
