Change tundra.service:self to return nothing rather than null, if
invoked directly