Distinguish between mapped and unmapped clients.

I think I've been doing this already before - but honestly I've changed
quite a lot, so I don't really know what's new here...