Updated to use ECJ 4.3.2