add parens, update for latest rust master