Fix more files accidentally overwritten by my earlier merge.