Can we get rid of all the `-dev`?