Make req-containers more type-scanner friendly