Fix parsing into a typed structure.