Fixes for errors noticed in Mark B's review of *-to-dpla refactor