* extras/contrib/bootstrap, extras/contrib/src/Makefile: cleanup (hopefully without breaking anything).