I think duck-typing is the way to go here. When I get an actual internet connection I'll update the PR.