Math and aggregate expressions

The ELM Count object doesn't have 'operand'.  It has 'source' (and 'path' as well, but I'm not sure what to do with that).  So this (and the Count class) should be updated to reflect the ELM model.