Revert safe varargs fix until we figure out how to let this play nicely with Java6.