Some fixes for block statement types.