Reworked simple and compound scope.