Merge with head. style.py was also missing an argument in one call to modified_lines.