Added support for a few more atomic expressions. Still very simple.