Hmm, thought I'd killed that line. Good catch.

About django-mobility: maaaaybe? I can try and see what happens.