Fix some outstanding nits from CL 6356061
Fix some outstanding nits from CL 6356061

Simplify the check for indirect/implicit control flow and fix an indentation error.

See: http://codereview.appspot.com/6356061

BUG=

Review URL: https://codereview.appspot.com/6445059

git-svn-id: db59699583a60be9a535cd09cdc9132301867226@1015 15e8cca8-e42c-11de-a347-f34a4f72eb7d

sebmarchand/syzygy,Eloston/syzygy,wangming28/syzygy,google/syzygy,pombreda/syzygy,pombreda/syzygy,ericmckean/syzygy,google/syzygy,ericmckean/syzygy,ericmckean/syzygy,google/syzygy,sebmarchand/syzygy,ericmckean/syzygy,wangming28/syzygy,pombreda/syzygy,ericmckean/syzygy,wangming28/syzygy,Eloston/syzygy,sebmarchand/syzygy,pombreda/syzygy,google/syzygy,supriyantomaftuh/syzygy,supriyantomaftuh/syzygy,supriyantomaftuh/syzygy,supriyantomaftuh/syzygy,pombreda/syzygy,wangming28/syzygy,sebmarchand/syzygy,sebmarchand/syzygy