Extracted the parts that fix the makeinfo errors.