Clean individual models

I prefer
```
try:
   app, = target
except ValueError:
    pass

try:
    app, model = target
except ValueError:
    raise
```

Has more symmetry to enable extension.