Make changes necessitated by upgrade to X10 2.5.0.