Singleton options clarified. Ticket #83.