Reparallelize

r? @SimonSapin and/or @larsbergstrom