So the problem may be how blocks and inline partials work today.  @jimmyhchan and I were playing around with them, and they really just made no sense.  However, I think your original PR is useful, so let's stick with that, and then revisit this issue more deeply later on.