Sorry, real merge now
New occurrences of _accumulateCols_ removed