(Partial?) Fix ensure_completely_loaded, testsuite passes with Django 1.4, 1.5, 1.6