Fix syntax and style errors after branch merging.