Minor cleanup; last commit before downsizing...