Remove occurrences of duck-typing