Layout and index syntax changes.