nit: no space after if, for, etc. This has been wrong, even before your patch so it’s really not your fault. Would be nice to fix it though while at it :)