Improve robustness of 'make bootstrap'.