Minor improvements in transform.