Oops. Also merge 0-way (duh).