Fix some more warnings

Get rid of some more warnings.  I think my `ProcessFifoWaitEvents()` change had been wrong, darn.

-[Unknown]