Updates for another `make distclean` fix upstream