Add subexpression names to output JSON