diff --git a/src/conduit/SprintManiphestConduitAPIMethod.php b/src/conduit/SprintManiphestConduitAPIMethod.php
index cbde1d8c926d7aed072f2aafc1147c15109eef56..b46eb5b0ab59dc230782c658340967f460264b00 100644
--- a/src/conduit/SprintManiphestConduitAPIMethod.php
+++ b/src/conduit/SprintManiphestConduitAPIMethod.php
@@ -61,7 +61,7 @@ abstract class SprintManiphestConduitAPIMethod extends ConduitAPIMethod {
     if ($is_new) {
       $task->setTitle((string)$request->getValue('title'));
       $task->setDescription((string)$request->getValue('description'));
-      $changes[ManiphestTransaction::TYPE_STATUS] =
+      $changes[ManiphestTaskStatusTransaction::TRANSACTIONTYPE] =
           ManiphestTaskStatus::getDefaultStatus();
       $changes[PhabricatorTransactions::TYPE_SUBSCRIBERS] =
           array('+' => array($request->getUser()->getPHID()));
@@ -74,12 +74,12 @@ abstract class SprintManiphestConduitAPIMethod extends ConduitAPIMethod {
 
       $title = $request->getValue('title');
       if ($title !== null) {
-        $changes[ManiphestTransaction::TYPE_TITLE] = $title;
+        $changes[ManiphestTaskTitleTransaction::TRANSACTIONTYPE] = $title;
       }
 
       $desc = $request->getValue('description');
       if ($desc !== null) {
-        $changes[ManiphestTransaction::TYPE_DESCRIPTION] = $desc;
+        $changes[ManiphestTaskDescriptionTransaction::TRANSACTIONTYPE] = $desc;
       }
 
       $status = $request->getValue('status');
@@ -89,7 +89,7 @@ abstract class SprintManiphestConduitAPIMethod extends ConduitAPIMethod {
           throw id(new ConduitException('ERR-INVALID-PARAMETER'))
               ->setErrorDescription(pht('Status set to invalid value.'));
         }
-        $changes[ManiphestTransaction::TYPE_STATUS] = $status;
+        $changes[ManiphestTaskStatusTransaction::TRANSACTIONTYPE] = $status;
       }
     }
 
@@ -100,7 +100,7 @@ abstract class SprintManiphestConduitAPIMethod extends ConduitAPIMethod {
         throw id(new ConduitException('ERR-INVALID-PARAMETER'))
             ->setErrorDescription(pht('Priority set to invalid value.'));
       }
-      $changes[ManiphestTransaction::TYPE_PRIORITY] = $priority;
+      $changes[ManiphestTaskPriorityTransaction::TRANSACTIONTYPE] = $priority;
     }
 
     $owner_phid = $request->getValue('ownerPHID');
@@ -109,7 +109,7 @@ abstract class SprintManiphestConduitAPIMethod extends ConduitAPIMethod {
           array($owner_phid),
           PhabricatorPeopleUserPHIDType::TYPECONST,
           'ownerPHID');
-      $changes[ManiphestTransaction::TYPE_OWNER] = $owner_phid;
+      $changes[ManiphestTaskOwnerTransaction::TRANSACTIONTYPE] = $owner_phid;
     }
 
     $ccs = $request->getValue('ccPHIDs');
diff --git a/src/query/SprintQuery.php b/src/query/SprintQuery.php
index 6964ed1420c2d672d79003d8eebd108ae12b5b0c..7d6015150166b5f3609060398371d07bb4aed877 100644
--- a/src/query/SprintQuery.php
+++ b/src/query/SprintQuery.php
@@ -304,7 +304,8 @@ final class SprintQuery extends SprintDAO {
   }
 
   public function extractEvents($xactions) {
-    assert_instances_of($xactions, 'ManiphestTransaction');
+    // Maniphest transactions are now modular ...
+    //assert_instances_of($xactions, 'ManiphestTransaction');
 
     $events = array();
     foreach ($xactions as $xaction) {
diff --git a/src/storage/BoardDataProvider.php b/src/storage/BoardDataProvider.php
index d9418c5d030d0030c62a8968373d0fbc05376aa4..221c6d83c9cb45110236f2f4f84cc11759abd742 100644
--- a/src/storage/BoardDataProvider.php
+++ b/src/storage/BoardDataProvider.php
@@ -168,7 +168,7 @@ final class BoardDataProvider {
     $scope_phid = $this->project->getPHID();
     $task_phids = mpull($this->tasks, 'getPHID');
     $query = new ManiphestTransactionQuery();
-    $query->withTransactionTypes(array(ManiphestTransaction::TYPE_STATUS));
+    $query->withTransactionTypes(array(ManiphestTaskStatusTransaction::TRANSACTIONTYPE));
     $query->withObjectPHIDs($task_phids);
     $query->setViewer($this->viewer);
     $stories = $query->execute();
diff --git a/src/storage/SprintColumnTransaction.php b/src/storage/SprintColumnTransaction.php
index 6307639e4fa93aa41e8b89467f648cd52d1ad906..5077449aeb2f91c0ba21de30486b92854143c227 100644
--- a/src/storage/SprintColumnTransaction.php
+++ b/src/storage/SprintColumnTransaction.php
@@ -116,7 +116,7 @@ final class SprintColumnTransaction {
   }
 
   public function setEventsTaskStatus($xactions) {
-    assert_instances_of($xactions, 'ManiphestTransaction');
+    //assert_instances_of($xactions, 'ManiphestTransaction');
     $events = array();
     foreach ($xactions as $xaction) {
       if ($xaction->getOldValue() == null) {
diff --git a/src/view/reports/SprintReportBurnUpView.php b/src/view/reports/SprintReportBurnUpView.php
index 1e5450e5eb8aadf9d279a7b6525e07e0a0299f41..6b7d821609565f2f66aa08f7949803d46b1ef1c6 100644
--- a/src/view/reports/SprintReportBurnUpView.php
+++ b/src/view/reports/SprintReportBurnUpView.php
@@ -32,7 +32,7 @@ final class SprintReportBurnUpView extends SprintView {
   private function getXactionData($project_phid) {
      $query = id(new SprintQuery())
         ->setPHID($project_phid);
-      $data = $query->getXactionData(ManiphestTransaction::TYPE_STATUS);
+      $data = $query->getXactionData(ManiphestTaskStatusTransaction::TRANSACTIONTYPE);
     return $data;
   }