Avoid more possible factoring

Reviewers: eater

Reviewed By: eater

Differential Revision: http://phabricator.khanacademy.org/D9821