Added variable-grouping and control-case considerations.