Updates for changes in Makefile rules.