Fixing stupid compilation failures.

This is what happens when you refactor while other changes half
finished.