lib: Polishing parser

2 jobs for master in 1 minute and 25 seconds (queued for 18 seconds)