Add FIXMEs to remove generic type argument