Fix empty-statements-in-blocks bug