Checkpoint:  "clean" XAML, pre rewrite