GROOVY-7001: improved generics for return types for some DGM methods (back out in places where @CS is problematic)