Changed the way expressions are compiled