Fixed remnants of botched merge resolution.