This will conclude the trivial class replacements. (cherry picked from commit 82e102f8b09faf1ac2786ccad36d4a20fcb392b8)