Second gnarf here, can we change those to `r++` for consistency?
Thanks.