Migrate the rest of the aliasing violation fixes.

These files moved so git didn't pick up on it.