fix possible null access
reorder inline expansion

see example/affine-transform.jsx