Moved expression stuff to another file.