auto-shift fixes all the issues on the test suite anyways. \cc @TiarkRompf