Fix leaking trait imports across modules

Turned out to be a 2-line fix, but the compiler fallout was huge.