Refactored diff parsing for gutters...