More work prepping for Larch+Demeter on Windows