epyc: added scoping to group blocks