hoisting rank1 out to a top level definiton finally avoids the
simplifier exploding. ugh.