proper handling of classes an zerowidth

jnthn++, I am just his commitbot :o)