Small v1.2 cleanups.

I've finally checked out the latest changes and redid some small clean-ups against the v1.2 branch. I also still think the forward declaration for *SUITE* is the best way to handle the warning, so I've included that as well.