nit: could you also add '{' for single statement for body (here and below) (you copy'n'pasted old code -- coding style changes to require those)