Further clean up things from stdlib.