Preprocessor no longer uses unnecessary map (had to iterate through it anyway).
Attribute/Value mapping now works in preprocessor.