Fleshed the expression wrapper a bit more