Gave up with my font-hacking ways - using <span>s!