Fixed Generic Expression bug, more cleanup