"AF_UNIX path too long" error when unit name exceeds about 30 characters

When I join a relationship between two charms I'm seeing this:

2012-10-19 08:42:56,914 unit:productsearch-nrpe-squidreverseproxy/4: twisted ERROR: Unhandled Error
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 391, in errback
    self._startRunCallbacks(fail)
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 458, in _startRunCallbacks
    self._runCallbacks()
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 545, in _runCallbacks
    current.result = callback(current.result, *args, **kw)
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1095, in gotResult
    _inlineCallbacks(r, g, deferred)
--- <exception caught here> ---
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1037, in _inlineCallbacks
    result = result.throwExceptionIntoGenerator(g)
  File "/usr/lib/python2.7/dist-packages/twisted/python/failure.py", line 382, in throwExceptionIntoGenerator
    return g.throw(self.type, self.value, self.tb)
  File "/usr/lib/python2.7/dist-packages/juju/agents/base.py", line 245, in startService
    yield self.start()
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/usr/lib/python2.7/dist-packages/juju/agents/unit.py", line 86, in start
    self.api_socket = reactor.listenUNIX(socket_path, self.api_factory)
  File "/usr/lib/python2.7/dist-packages/twisted/internet/posixbase.py", line 397, in listenUNIX
    p.startListening()
  File "/usr/lib/python2.7/dist-packages/twisted/internet/unix.py", line 123, in startListening
    raise CannotListenError, (None, self.port, le)
twisted.internet.error.CannotListenError: Couldn't listen on any:/var/lib/juju/units/productsearch-nrpe-squidreverseproxy-4/units/productsearch-nrpe-squidreverseproxy-4/.juju.hookcli.sock: AF_UNIX path too long.

The path exceeds 108 characters which appears to be the UNIX_PATH_MAX.

I think juju should enforce a maximum service name length at deploy time and also the path to the socket should be shortened as it currently seems to duplicate the service name.