Merge branch '157-simplify-likelihoods' into 166-implement-caching-in-waveformgenerator-__parameters_from_source_model