Fix more bugs caused by my changing the repository layout.