Resolve some BUGBUG comments.

git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@396783 f38db490-d61c-443f-a65b-d21fe96a405b