Fix up some number scrubber focus issues. Update structured-blocks.