Use more explicit, less cryptic `x_shape` and `y_shape` instead of `xsh`, `ysh`.