Switch from 2x2 affine transform matrix (+dx, dy) to slightly cleaner 3x3 augmented matrix which incorporates dx, dy
(#467b)