Fix drag and drop to not require superfluous generic type parameters