> Nit-picking, but you don't need the if here, since you always put the right boolean anyway. (Same for all other PRs)

I know. I just didn't want the setting in there when not needed. :)