Cleans up the expressions a bit

This removes some dead code, moves construct to remove cyclic dep, and cleans up a bit.