Merge "Readability fix: if statement assignments"