Further tweaks to use common XXXFieldManager code