diff --git a/src/rewrite/Att.cpp b/src/rewrite/Att.cpp
index d10b68ea4..8bd34fb1f 100644
--- a/src/rewrite/Att.cpp
+++ b/src/rewrite/Att.cpp
@@ -38,7 +38,7 @@ Att::Att ()
 ////////////////////////////////////////////////////////////////////////////////
 Att::Att (const std::string& name, const std::string& value)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Att::Att");
   mName  = name;
   mValue = value;
 
@@ -47,7 +47,7 @@ Att::Att (const std::string& name, const std::string& value)
 ////////////////////////////////////////////////////////////////////////////////
 Att::Att (const Att& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Att::Att");
   mName  = other.mName;
   mValue = other.mValue;
   mMods  = other.mMods;
@@ -56,7 +56,7 @@ Att::Att (const Att& other)
 ////////////////////////////////////////////////////////////////////////////////
 Att& Att::operator= (const Att& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Att::operator=");
   if (this != &other)
   {
     mName  = other.mName;
@@ -77,20 +77,20 @@ Att::~Att ()
 //    name [[.mod] ...] : [value]
 void Att::parse (const std::string& input)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Att::parse");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string Att::composeF4 () const
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Att::composeF4");
   return "";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void Att::addMod (const std::string&)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Att::addMod");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -120,34 +120,34 @@ void Att::value (const std::string& value)
 ////////////////////////////////////////////////////////////////////////////////
 int Att::value_int () const
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Att::value_int");
   return 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void Att::value_int (int)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Att::value_int");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 bool Att::filter () const
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented filter");
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 bool Att::required () const
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Att::required");
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 bool Att::internal () const
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Att::internal");
   return false;
 }
 
diff --git a/src/rewrite/Context.cpp b/src/rewrite/Context.cpp
index b93afc562..c68344681 100644
--- a/src/rewrite/Context.cpp
+++ b/src/rewrite/Context.cpp
@@ -35,7 +35,7 @@ Context::Context ()
 ////////////////////////////////////////////////////////////////////////////////
 Context::Context (const Context& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Context::Context");
 //  config   = other.config;
   filter   = other.filter;
   keymap   = other.keymap;
@@ -47,7 +47,7 @@ Context::Context (const Context& other)
 ////////////////////////////////////////////////////////////////////////////////
 Context& Context::operator= (const Context& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Context::operator=");
   if (this != &other)
   {
 //    config   = other.config;
@@ -69,7 +69,7 @@ Context::~Context ()
 ////////////////////////////////////////////////////////////////////////////////
 void Context::initialize ()
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Context::initialize");
   // TODO Load config.
   // TODO Load pending.data.
   // TODO Load completed.data.
@@ -79,7 +79,7 @@ void Context::initialize ()
 ////////////////////////////////////////////////////////////////////////////////
 int Context::commandLine (int argc, char** argv)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Context::commandLine");
   // TODO Support rc: override.
   return 0;
 }
@@ -87,7 +87,7 @@ int Context::commandLine (int argc, char** argv)
 ////////////////////////////////////////////////////////////////////////////////
 int Context::run ()
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Context::run");
   // TODO Dispatch to command handlers.
   // TODO Auto shadow update.
   // TODO Auto gc.
diff --git a/src/rewrite/Date.cpp b/src/rewrite/Date.cpp
index f01d22506..ad761b2a6 100644
--- a/src/rewrite/Date.cpp
+++ b/src/rewrite/Date.cpp
@@ -35,14 +35,14 @@ Date::Date ()
 ////////////////////////////////////////////////////////////////////////////////
 Date::Date (const Date& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Date::Date");
   mTime = other.mTime;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 Date& Date::operator= (const Date& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Date::operator=");
   if (this != &other)
   {
     mTime = other.mTime;
@@ -63,7 +63,7 @@ Date::~Date ()
 // TODO Relative dates (today, tomorrow, yesterday, +1d, -2w, eow, eom, eoy)
 void Date::parse (const std::string& input)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Date::parse");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/rewrite/Duration.cpp b/src/rewrite/Duration.cpp
index 87c797c68..56d0ee4a5 100644
--- a/src/rewrite/Duration.cpp
+++ b/src/rewrite/Duration.cpp
@@ -36,14 +36,14 @@ Duration::Duration ()
 ////////////////////////////////////////////////////////////////////////////////
 Duration::Duration (const Duration& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Duration::Duration");
   mSeconds = other.mSeconds;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 Duration& Duration::operator= (const Duration& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Duration::operator=");
   if (this != &other)
   {
     mSeconds = other.mSeconds;
@@ -60,7 +60,7 @@ Duration::~Duration ()
 ////////////////////////////////////////////////////////////////////////////////
 void Duration::parse (const std::string& input)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Duration::parse");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/rewrite/Filter.cpp b/src/rewrite/Filter.cpp
index c6260d880..ba5e2b521 100644
--- a/src/rewrite/Filter.cpp
+++ b/src/rewrite/Filter.cpp
@@ -35,14 +35,14 @@ Filter::Filter ()
 ////////////////////////////////////////////////////////////////////////////////
 Filter::Filter (const Filter& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Filter::Filter");
   mAtts = other.mAtts;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 Filter& Filter::operator= (const Filter& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Filter::operator=");
   if (this != &other)
   {
     mAtts = other.mAtts;
@@ -59,14 +59,14 @@ Filter::~Filter ()
 ////////////////////////////////////////////////////////////////////////////////
 void Filter::add (Att& att)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Filter::add");
   mAtts.push_back (att);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 bool Filter::pass (T&)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Filter::pass");
   return false;
 }
 
diff --git a/src/rewrite/Keymap.cpp b/src/rewrite/Keymap.cpp
index c4101ffda..388300cfd 100644
--- a/src/rewrite/Keymap.cpp
+++ b/src/rewrite/Keymap.cpp
@@ -36,14 +36,14 @@ Keymap::Keymap ()
 ////////////////////////////////////////////////////////////////////////////////
 Keymap::Keymap (const Keymap& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Keymap::Keymap");
 //  mOne = other.mOne;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 Keymap& Keymap::operator= (const Keymap& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Keymap::operator=");
   if (this != &other)
   {
 //    mOne = other.mOne;
@@ -60,7 +60,7 @@ Keymap::~Keymap ()
 ////////////////////////////////////////////////////////////////////////////////
 void Keymap::load (const std::string& file)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Keymap::load");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/rewrite/Record.cpp b/src/rewrite/Record.cpp
index f3eaad67c..f74517d9d 100644
--- a/src/rewrite/Record.cpp
+++ b/src/rewrite/Record.cpp
@@ -35,14 +35,14 @@ Record::Record ()
 ////////////////////////////////////////////////////////////////////////////////
 Record::Record (const Record& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Record::Record");
   mAtts = other.mAtts;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 Record& Record::operator= (const Record& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Record:operator=");
   if (this != &other)
   {
     mAtts = other.mAtts;
diff --git a/src/rewrite/Sequence.cpp b/src/rewrite/Sequence.cpp
index 75b68bcd3..709a23a46 100644
--- a/src/rewrite/Sequence.cpp
+++ b/src/rewrite/Sequence.cpp
@@ -36,14 +36,14 @@ Sequence::Sequence ()
 ////////////////////////////////////////////////////////////////////////////////
 Sequence::Sequence (const Sequence& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Sequence::Sequence");
   mSequence = other.mSequence;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 Sequence& Sequence::operator= (const Sequence& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Sequence::operator=");
   if (this != &other)
   {
     mSequence = other.mSequence;
@@ -60,7 +60,7 @@ Sequence::~Sequence ()
 ////////////////////////////////////////////////////////////////////////////////
 void Sequence::parse (const std::string& input)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented Sequence::parse");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/rewrite/T.cpp b/src/rewrite/T.cpp
index 9a76e9cc2..f88d4b179 100644
--- a/src/rewrite/T.cpp
+++ b/src/rewrite/T.cpp
@@ -36,20 +36,20 @@ T::T ()
 ////////////////////////////////////////////////////////////////////////////////
 T::T (const T& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented T::T");
 //  mOne = other.mOne;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 T::T (const std::string& input)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented T::T");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 T& T::operator= (const T& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented T::operator=");
   if (this != &other)
   {
 //    mOne = other.mOne;
@@ -66,21 +66,21 @@ T::~T ()
 ////////////////////////////////////////////////////////////////////////////////
 std::string T::composeF4 ()
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented T::composeF4");
   return "";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string T::composeCSV ()
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented T::composeCSV");
   return "";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void T::parse (const std::string& input)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented T::parse");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/rewrite/TDB.cpp b/src/rewrite/TDB.cpp
index a8283d2bf..5526a5611 100644
--- a/src/rewrite/TDB.cpp
+++ b/src/rewrite/TDB.cpp
@@ -36,14 +36,14 @@ TDB::TDB ()
 ////////////////////////////////////////////////////////////////////////////////
 TDB::TDB (const TDB& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented TDB::TDB");
   mLocations = other.mLocations;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 TDB& TDB::operator= (const TDB& other)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented TDB::operator=");
   if (this != &other)
   {
     mLocations = other.mLocations;
@@ -60,7 +60,7 @@ TDB::~TDB ()
 ////////////////////////////////////////////////////////////////////////////////
 void TDB::location (const std::string& path)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented TDB::location");
   mLocations.push_back (path);
 }
 
@@ -68,7 +68,7 @@ void TDB::location (const std::string& path)
 // TODO Returns number of filtered tasks.
 int TDB::load (std::vector <T>& tasks, Filter& filter)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented TDB::load");
   return 0;
 }
 
@@ -76,21 +76,21 @@ int TDB::load (std::vector <T>& tasks, Filter& filter)
 // TODO Write to transaction log.
 void TDB::update (T& before, T& after)
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented TDB::update");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TODO writes all, including comments
 int TDB::commit ()
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented TDB::commit");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TODO -> FF4
 void TDB::upgrade ()
 {
-  throw std::string ("unimplemented");
+  throw std::string ("unimplemented TDB::upgrade");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/rewrite/X.cpp b/src/rewrite/X.cpp
deleted file mode 100644
index 24688b1ef..000000000
--- a/src/rewrite/X.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
-//
-// Copyright 2006 - 2009, Paul Beckingham.
-// All rights reserved.
-//
-// This program is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free Software
-// Foundation; either version 2 of the License, or (at your option) any later
-// version.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-// details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program; if not, write to the
-//
-//     Free Software Foundation, Inc.,
-//     51 Franklin Street, Fifth Floor,
-//     Boston, MA
-//     02110-1301
-//     USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include "X.h"
-
-////////////////////////////////////////////////////////////////////////////////
-X::X ()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-X::X (const X& other)
-{
-//  mOne = other.mOne;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-X& X::operator= (const X& other)
-{
-  if (this != &other)
-  {
-//    mOne = other.mOne;
-  }
-
-  return *this;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-X::~X ()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/rewrite/X.h b/src/rewrite/X.h
deleted file mode 100644
index 95b9c6d0e..000000000
--- a/src/rewrite/X.h
+++ /dev/null
@@ -1,42 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// task - a command line task list manager.
-//
-// Copyright 2006 - 2009, Paul Beckingham.
-// All rights reserved.
-//
-// This program is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free Software
-// Foundation; either version 2 of the License, or (at your option) any later
-// version.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-// details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program; if not, write to the
-//
-//     Free Software Foundation, Inc.,
-//     51 Franklin Street, Fifth Floor,
-//     Boston, MA
-//     02110-1301
-//     USA
-//
-////////////////////////////////////////////////////////////////////////////////
-#ifndef INCLUDED_X
-#define INCLUDED_X
-
-class X
-{
-public:
-  X ();                    // Default constructor
-  X (const X&);            // Copy constructor
-  X& operator= (const X&); // Assignment operator
-  ~X ();                   // Destructor
-
-private:
-};
-
-#endif
-////////////////////////////////////////////////////////////////////////////////