[CLEANUP] Shorten the line lengths even more.