Another volley of MSVC9 declaration fixes.