modify expr.py to handle atoms