Improve handling of group variable declarations