Some cleanup and fixing addService() on the interface modal.

Careful with the references to self/this on model classes.