Finish convert blocks to enums.