Simplify code Newer java versions have changed the method signatures to varargs. Use those varargs. Part of #435 and Bugzilla Id: 62972