Merge "init: Fix parser line numbering"