A few more optimizations.

The build is broken with this commit.