Improved return types to suppress generics warnings from ant build.