Remove variables in non-paramaterized classes.

This just adds extra variables that serve no real purpose
and hide the origin of the data we're dealing with.  Convert
this to direct calls.