Eliminate __axis_aligned_box
Generalize regular_grid a bit