Symbol table now takes expressions rather than variables
fix up