Update to ECJ.
Port some fixes from web to keep in sync.