huge cleaning on expression wrappers <super unstable commit>