Adapt to simplification of InfRequest API