Remove redundant checks in some update functions. Adds some readability/coding standards cleanup.

Props miqrogroove, azaozz.
Fixes #22828.


git-svn-id: https://develop.svn.wordpress.org/trunk@25256 602fd350-edb4-49c9-b593-d223f7449a82