Minor optimizer changes.