Simplifies the two remaining templates (for grappelli support).