Improve readability of vote lockout processing (#16987)