More instruction and location types.  Restructuring.