Further work on support for non-terminal fields and parameterized sorts