Reapply line-height change with fixes for normal line-height and inline images.

Wikipedia, lipsum, and everything else I looked at seems fine now.