Make entity::zip variadic ( consider adding non variadic version )
Clean up variadics and no variadic support