Thanks @bartvde.
The new dedicated getfeatureinfo example shows how to combine feature info from a WMS and a vector layer. The other examples that previously used getFeatureInfo from vector layers now use the more appropriate getFeatures.