[clang-warning-fix][dangling-else]

My last change to this file created some dangling elses that could be ambiguously parsed.