add SingletonSet/SingletonMap for #201