Commit before GP2 meeting. Reconciling Interp.hs and GPCondition.hs in progress.