Refactor blocks to be inline.