Simplify parser after go issue n°8672 fix.