Comment updates and initialization reordering.