Wow that was quick! Thank you Henning!
Unfortunately your commit does not build and fails with
``` core/resolve.c: In function ‘get_record’: core/resolve.c:940:9: error: ‘T_OPT’ undeclared (first use in this function) case T_OPT: ^~~~~ core/resolve.c:940:9: note: each undeclared identifier is reported only once for each function it appears in ```
I guess you need to use the lower level ns_t_opt instead of T_OPT