Remove all 'n's special casing which is handled well now.
Refactor grid_shape making in Distribution.from_shape

as per @kwmsmith's recommendations