Fix new check for missing semicolon after struct definition to deal with the

case where the type in the following declaration is specified as a template-id,
and refactor for clarity.

llvm-svn: 195280