Refactor in prep for byblock.