Fix design flaws from bad merge.