Yes, that is exactly correct; good analysis. I need to add support for H symbols, which I did not expect to encounter in that function....