Better fix up of mixed inline/block content.
Don't trim whitespace if inside another inline node.