Bit of tidyup around expressions of rules and generation counting.