Removed DECLARE_OLD_HANDLE. Fixed a few remaining warnings.

7 files changed