Primo: make data extraction slightly more general

Are you manually typing in the test cases? You should be using Scaffold to generate them, which would tell you (and us) what the current output of the translator is.