Factorise non instanced 2nd pass too.