Minor expr parser tweaks