Port improvement (EF.newInstance is slow).