Comment by donenext

Can we completely eliminate generic as a type to remove this crutch?