Simplify import generation for generated clients.

There's a complex web of trickery in place for how I write import lines in
generated clients, mostly to make things work both internally and externally.
At this point, it's just confusing -- simplifying for now and I'll deal with
merging it internally later.
Add defaults for client ID/client secret.