some cleanup in afix fragment generation