More dancing with generic type definitions to stop the compiler warnings