Remove unneeded scratch objects and clean up some getValue usage.

In reality, MockProperty needs to be overhauled and maybe replaced, but that's outside the scope of this pull.