Preparation for https://github.com/jfly/gjcomps/issues/83.