More fixes to make distclean work.