Debugged my previous commit.

I committed without trying to compile yet. Produced compile-time errors
and I fixed it already. :)