Improve underscored support for portability from django.