Non-controversial early merge cleanups from the native-r8s branch

The smaller cleanups hiding inside of #3676 that don't really touch much.