b6499e5248
_updateState has a lot of variables that sort of gunk up the code and make it more unreadable than need be. Clean up the logic a lot by moving those variables into the places that they actually matter, renaming them to remove prefixes, and remove some conditions that are always met.