Queryset-refactor branch has been merged into trunk. Malcolm’s latest Django masterpiece is complete.