Interesting, thank you for these information.

I just checked the HTLCs I found and there was none in Dec 2017. So it seems the LN HTLCs have another structure. I will take a deeper look into this in the next days.