Went a bit too quick. Just submit either as a new PR or append to this one (even though I already merged it).