Reposition wrapper stuff in cf-grid helpers