Partially fix build with rust master.

comm, shuf still broken.