Use HTML comments instead of spans