Minor refactoring for the BlockBuilder