Agree, but be sure to pass `shape` to the constructors if you decide to keep the one-liner.