DiD: expand last few cases of ALLOW_RECRUIT and removed macro