This change does some initial clean-up in preparation for implementing
settings layers in the diff settings object.

Testing Done:
Ran unit tests.

Reviewed at https://reviews.reviewboard.org/r/14432/