Improved prevalence fns to cope with any aggregate vars