Fixed gross nasty self. references for class variables