SQL improvements: added function token (perhaps should be `aggregate` and aliased to function), improved operators a bit, converted regex groups to non capturing