can we just pass these in at the one call site? the extra branch here doesn't seem worthwhile.