Move arguments from gm to services, fix resulting side effects