Tweaks and cleanup for poly-affine workflow