Yeah, we can merge these changes, but I think we should revisit the indentation policy for wrapped lines.