rewrite the parsing of field names to be more consistent wrt recursive expansion
2 files changed