Add missing variable annotation. Remove unecessary annotations. Now pass. svn: r9522 original commit: 53709f1faffae5533a8a700582d13a817c829dd6
svn: r9404 original commit: fca36c126c2f26e8e930ad66220b4dccd6c86028