Some tidying up of AR field generation