Fix dependencies following 2011-02-26T05:54:36Z!eggert@cs.ucla.edu.