* Flattening/simplifying some nested conditionals * const-ifying some local variables Depends On D143800 Reviewed By: aartbik Differential Revision: https://reviews.llvm.org/D143949