Regen with Frog commit aa76b2a1, fixing problem with pre blocks.