[COMMIT] fix problems running texinfmt, 21.4