Fix Issue 12608 - Avoid dead assignments.