Removed traces of CWLSynthesizeSingleton macros.