Update and indent to match single branch.