Revised handling of pictures to improve consistency.