Found easier way to access the typevariables of singletons when writing the rcs parser. Now moved the other singletons to the same construction.