We got a github PR to address the original issue, which I will be merging shortly (closing this ticket). I agree with Sam that fetching the etype-info2 information would be a superior solution, though it would require much more work. I will open a separate ticket for that.