Mind also changing coding style to break such lines that are >= 80 columns? Makes way easier to read and maintain.