The changes in https://github.com/openmm/openmm/pull/2818 would also be super helpful for the COVID Moonshot.