Cleanly testing variadic mapping and related bug fixes