Optimizations, removed need for value getters.