Wagtailcore cleanup

Various bits of cleanup in wagtailcore