Changes to use MaxLineLength again (looks like these got overwritten in the merge)