This was a hack which is no longer necessary now since we introduce a dedicated entry block for each procedure.