Add missing files from previous commit.
Fix meta-substitution for nested blocking binders.