Update for wintersmith2.