More fixes for newer versions of texinfo