Fixed the macro for defining generics. The workaround is no longer needed.