Changed ValueHolder to be simpler with less methods

I got tired of typing out all of the methods inside a switch, it
was easier to just share the same enum.