Analytical insight into dark matter subhalo boost factors for Sommerfeld-enhanced s- and p-wave γ-ray signals. Issue 2 (1st February 2023)