Quickswitch patches

Two patches, the first merely cosmetic, the second a bit more interesting.

I'm also considering adding functionality for moving containers to workspaces. I initially thought that --move would help me out there, but it looks like I was mistaken. Is that something you might be interested in or do you have any argument as to why that might not be a good idea?

Thanks for a great project, I was very close to implementing pretty much the same thing myself before being informed of its existence.