Agreed, we might want to optimize that in the future. However, this function is quite versatile...
Anyway, I removed one parameter in my last push.