Make the singleton behavior a bit clearer [IMMUTANT-286]