BUG:  Didn't handle affine properly.