Merge "Fix usage of () and []."