Add a <span> around a text node for some reason

Also we should pack validator-functions in spans

Test Plan: make lint; make pack

Auditors: csilvers, peter