DirectFieldAccessor cleanup
Issue: SPR-9705, SPR-10623, SPR-8692