ref #6369 adapt existing occurrences of interface to removed generics