Herp.  Eclipse.
Patch up to elias branch.