Bug fix: Make wrapping actually respect comments vs code