Changes to make slicing more friendly.