Singleton forms, implements #2009