!str #16557 Rename Source.singleton to Source.single