Prepare the way for merge with Zach's repo.