Changes to allow easy interactive debugging in Eclipse.