Grid: more attr conversion refactoring