Add rudimentary grammar support for IDs in expressions