Simplify field parsing
This makes it easier to add more fields with the --values-to-log
tcplog option without breaking the layout.
This change was verified not to change the resulting plot with layout 2 files. Layout 1 files should work, but were not tested. Does someone have these lying around?