Fix long lines in 1411893