Support dynamic return types for the blocks in -match.