PatternDispatch: replace deprecated functions