Remove line retrieval as it is done in the C code.
Add the case where a variable is used in the field name.