Short directions

This is a bunch of commits from https://bugs.launchpad.net/imaginary/+bug/1215929 that somehow got lost during the migration to git.