Libraries and parsing tweak.