That discussion didn't really go anywhere, but it seems that there was 2-1 support for the second option, and it is too small of a detail to be controversial. Can you implement it?
I'm working on the headword module anyway so I will probably include this along with it.
Alright, thanks!