I've used the "assignment-returns-assigned-value" trick myself but I generally prefer to use a variable instead, unless I really want a one-liner. Since this is broken over many lines already, I don't see a huge readability benefit in using it here.

Having said that, don't bother changing it just to fix this issue. If you're going in to this code again anyway, maybe change it to a variable?