Merge "trivialize apf property accessor dead code"