Compiles again.  Yay!