--- a/imagej2_bunwarpj_raw_transform.xml	Fri Jun 19 16:59:58 2015 -0400
+++ b/imagej2_bunwarpj_raw_transform.xml	Fri Jun 26 05:29:00 2015 -0400
@@ -16,8 +16,7 @@
     --source_out "$source_out"
     --source_out_datatype $source_out_datatype
     --jython_script $__tool_directory__/jython_script.py
-    --max_heap_size_type $set_max_heap_size.max_heap_size_type
-    --max_heap_size $set_max_heap_size.max_heap_size
+    @max_heap_size_args@
 ]]>
     </command>
     <inputs>
@@ -59,25 +58,5 @@
 ]]>
 
     </help>
-    <citations>
-        <citation type="bibtex">
-            @InProceedings(Arganda-Carreras2006,
-                author =     "Ignacio Arganda-Carreras and
-                                    Carlos Oscar S{\'a}nchez Sorzano and
-                                    Roberto Marabini and
-                                    Jos{\'e} Mar\'{\i}a Carazo and
-                                    Carlos Ortiz-de-Solorzano and
-                                    Jan Kybic",
-                title =          "Consistent and Elastic Registration of Histological Sections Using Vector-Spline Regularization",    
-                publisher =  "Springer Berlin / Heidelberg",    
-                booktitle =   "Computer Vision Approaches to Medical Image Analysis",
-                series =       "Lecture Notes in Computer Science",
-                year =          "2006",
-                volume =      "4241",
-                pages =       "85-95",
-                month =       "May",
-                city =            "Graz, Austria")
-        </citation>
-        <citation type="doi">10.1038/nmeth.2019</citation>
-    </citations>
+    <expand macro="bunwarpj_citations" />
 </tool>