Unify `expected` and `calc_expectation`

We have two functions for calculating the expectation of a function over a distribution, which work in different ways and have *slightly* different syntax. These should be unified into a single interface with an option to select between the modes.