agent: Another set of Linux->BSD structure replacement fixes.