ADD: Scope.ifNotYet().
REFACTOR: Minor tweaks.