Refactor to ease per-subitem query.