Kirk's cleanup on block sizes