A minor rework.