It now compiles. Only fixed a couple of the warnings, and some
of them seem to indicate we need to take a closer look at some control
signals. I'll look at that more closely tomorrow.