Remove unnecessary uses of cloneWithProps

Test Plan: Crossed three fingers.

Reviewers: aria

Reviewed By: aria

Differential Revision: https://phabricator.khanacademy.org/D14900