Hrm, eclipse seems to have gone off and enforced some arbitrary set of indentation rules.  Let me clean some stuff up.