Couple of issues in r53270: use accessor method and keep the function signature bc