Cleaned up the support generation to match our settings.