Make paren indexing uniform. (r=dmandelin, b=605754)