nit: no need for parentheses. I'm going to stop writing this, but this applies throughout the patch.