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

Props miqrogroove, azaozz.
Fixes #22828.

Built from https://develop.svn.wordpress.org/trunk@25256


git-svn-id: http://core.svn.wordpress.org/trunk@25224 1a063a9b-81f0-0310-95a4-ce76da25c4cd