Updated to use 2.0.1, including the new LabelScanWriter.  Tests pass on a clean compile.