Turns out that taking out the Yahoo-specific code style was premature. Added it back and added another style to counteract it.