OK. I've looked over every expression that changed and verified that you've extracted only the assignment portion, that the assignment was done before the expression, that the correct variable replaced the assignment in the expression, and that those expressions which appeared inside `if` statements had the correct brackets around them. All in all, it looks like you did it correctly.