Apart from this line, I'm fine with merging this as-is.