Getting rid of find and collect static method references from DefaultGroovyMethods