seriously seriously simplify the inlining and code paths for all the combinators in the Shape module