Replace 0 with NULL.
Add names for expressions types.