(PUP-511) specify resource expressions

This updates the resource expression specification to be in line with the changes from PUP-2898. It also removes a few warts in the specification around Q- and Non-value expressions, which aren't needed anymore.
two rules with colons, only first has colon, the rest start with pipe