Gardening after merge ac354b4 a0aa576.