Fix handle shadow bugs.
More Wshadow fixes