Fix parser class (see last commit).