More code cleanup in the block collision code