A key state lawmaker has expanded pending arbitration legislation to restrict the use of choice-of-forum and choice-of-law clauses in consumer contracts affecting Californians.