Cleaned up FunextVarieties somewhat